From 975ae53b9663716bc680c43d85183c8fc3c9e9e5 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 29 Jan 2012 14:01:11 -0600 Subject: [PATCH] Add conflict with cedet, eieio, and speedbar. Don't allow the older standalone packages to remain installed since they break emacs23, emacs23 includes them, and they're no longer in unstable/testing. Thanks to Ivan Vilata i Balaguer for the report. Closes: #632142 --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 22bf71c741d..9aff25dfe6f 100644 --- a/debian/control +++ b/debian/control @@ -66,7 +66,7 @@ Package: emacs23-common Architecture: all Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} Suggests: emacs23-el, emacs23-common-non-dfsg -Conflicts: emacs23-el (<< ${Source-Version}) +Conflicts: emacs23-el (<< ${Source-Version}), cedet, eieio, speedbar Description: The GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure diff --git a/debian/control.in b/debian/control.in index 9512cd59c1f..e5b3ec55c86 100644 --- a/debian/control.in +++ b/debian/control.in @@ -66,7 +66,7 @@ Package: @DEB_FLAVOR@-common Architecture: all Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.15.4) | install-info, ${shlibs:Depends}, ${misc:Depends} Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg -Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}) +Conflicts: @DEB_FLAVOR@-el (<< ${Source-Version}), cedet, eieio, speedbar Description: The GNU Emacs editor's shared, architecture independent infrastructure GNU Emacs is the extensible self-documenting text editor. This package contains the architecture independent infrastructure -- 2.30.2